From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 23 Nov 2012 18:13:53 +0000 (+0200)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~3615^2~229^2~63^2~79
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=3f8879751b8dc5e007dd8e8acdea7c7e605a2612;p=emacs.git

Merge from trunk.
---

3f8879751b8dc5e007dd8e8acdea7c7e605a2612